5a0415af0a16ebb4b365b26fab67998c8417220d,vpnservice/fibmanager/fibmanager-impl/src/main/java/org/opendaylight/netvirt/fibmanager/VrfEntryListener.java,VrfEntryListener,createLocalFibEntry,#number#String#VrfEntry#,755

Before Change


            if (localNextHopInfo == null) {
            /* imported routes case */
                synchronized (vrfEntry.getLabel().toString().intern()) {
                    LabelRouteInfo lri = getLabelRouteInfo(vrfEntry.getLabel());
                    if (lri != null && lri.getPrefix().equals(vrfEntry.getDestPrefix())
                        && vrfEntry.getNextHopAddressList().contains(lri.getNextHopIpList().get(0))) {
                        if (RouteOrigin.value(vrfEntry.getOrigin()) == RouteOrigin.SELF_IMPORTED) {
                            Optional<VpnInstanceOpDataEntry> vpnInstanceOpDataEntryOptional =
                                FibUtil.getVpnInstanceOpData(dataBroker, rd);

After Change


            if (localNextHopInfo == null) {
            /* imported routes case */
                if (RouteOrigin.value(vrfEntry.getOrigin()) == RouteOrigin.SELF_IMPORTED) {
                    java.util.Optional<Long> optionalLabel = FibUtil.getLabelFromRoutePaths(vrfEntry);
                    if (optionalLabel.isPresent()) {
                        Long label = optionalLabel.get();
                        List<String> nextHopAddressList = FibUtil.getNextHopListFromRoutePaths(vrfEntry);
                        synchronized (label.toString().intern()) {
                            LabelRouteInfo lri = getLabelRouteInfo(label);
                            if (isPrefixAndNextHopPresentInLri(vrfEntry.getDestPrefix(), nextHopAddressList, lri)) {
                                Optional<VpnInstanceOpDataEntry> vpnInstanceOpDataEntryOptional =
                                        FibUtil.getVpnInstanceOpData(dataBroker, rd);
                                if (vpnInstanceOpDataEntryOptional.isPresent()) {